XM-Test takes a really long time to build the initrd it uses for testing. This patch...

Signed-off-by: Paul Larson <pl@us.ibm.com>

diff --git a/tools/xm-test/README b/tools/xm-test/README
index f65e9a26b58b4abcb52ff949d0ff57d58d3836fc..ca5b70e81a62a301ed127441a3ae05761d569285 100644 (file)
--- a/tools/xm-test/README
+++ b/tools/xm-test/README
@@ -49,6 +49,15 @@ Simply copy the initrd-X.Y.img file into ramdisk/ and then run:
 
    # make existing
 
+Or, you can run:
+   # INITRD="http://url.of.initrd.repo/" make existing
+
+You do not need to include the name of the image itself in the url, 
+however, an initrd with the right name (initrd.X.Y.img) and version 
+number must exist at that location.  The script will determine which 
+version of the initrd it needs and try to download the right file from 
+that location.
+
 This will set up the link so that xm-test will use the existing
 ramdisk.  Next, just run "runtest.sh" normally.  Note that in general,
 you should not attempt to use a ramdisk from a previous minor version

diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index f578028129c736207efcf6f7cce13e38118936d4..0cdca83c800ad48c49a4e555189d875efdd1123d 100644 (file)
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -57,6 +57,9 @@ disk.img: existing
        fi
 
 existing:
+       @if test -n "$(INITRD)"; then \
+               wget $(INITRD)/$(XMTEST_VER_IMG); \
+       fi
        @if [ -f $(XMTEST_VER_IMG) ] ; then \
                ln -sf $(XMTEST_VER_IMG) initrd.img; \
        else \